merge from trunk, no conflicts
authorJoakim <joakim@localhost.localdomain>
Wed, 18 Aug 2010 11:11:01 +0000 (13:11 +0200)
committerJoakim <joakim@localhost.localdomain>
Wed, 18 Aug 2010 11:11:01 +0000 (13:11 +0200)
commit1279b5e5e8db648800532657074901990e8f541c
treef2f8506982519602df2b6811db251c2a8911aff1
parentc1df267730b0ac9edc2dcc5c01b143faaee62ded
parent433afa844f1a16983682edfdd0df61979d8399f0
merge from trunk, no conflicts
etc/NEWS
lisp/image.el